From: David Reitter Date: Thu, 12 Nov 2009 00:26:09 +0000 (+0000) Subject: menu.c (Fx_popup_menu): Remove left-over debugging code and rename variables to fix... X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~9541 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=40e7c12f616e07f916dc939913a7ff6714d1410c;p=emacs.git menu.c (Fx_popup_menu): Remove left-over debugging code and rename variables to fix 2009-11-09 change. --- diff --git a/src/ChangeLog b/src/ChangeLog index 4ab7ae1247a..cc8ab506892 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-11-11 David Reitter + + * menu.c (Fx_popup_menu): Remove left-over debugging code and rename + variables to fix 2009-11-09 change. + 2009-11-11 Dan Nicolaescu * process.c (ifflag_def): Make flag_sym constant. diff --git a/src/menu.c b/src/menu.c index 44eebe8dbe7..313327d4721 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1074,10 +1074,6 @@ no quit occurs and `x-popup-menu' returns nil. */) Lisp_Object timestamp = Qnil; struct gcpro gcpro1; -#ifdef HAVE_NS - NSTRACE (ns_popup_menu); -#endif - if (NILP (position)) /* This is an obsolete call, which wants us to precompute the keybinding equivalents, but we don't do that any more anyway. */ @@ -1187,8 +1183,8 @@ no quit occurs and `x-popup-menu' returns nil. */) f = XFRAME (WINDOW_FRAME (win)); #ifdef HAVE_NS /* FIXME: Is this necessary?? --Stef */ - p.x = FRAME_COLUMN_WIDTH (f) * WINDOW_LEFT_EDGE_COL (win); - p.y = FRAME_LINE_HEIGHT (f) * WINDOW_TOP_EDGE_LINE (win); + xpos = FRAME_COLUMN_WIDTH (f) * WINDOW_LEFT_EDGE_COL (win); + ypos = FRAME_LINE_HEIGHT (f) * WINDOW_TOP_EDGE_LINE (win); #else xpos = WINDOW_LEFT_EDGE_X (win); ypos = WINDOW_TOP_EDGE_Y (win);